@evershop/evershop 2.1.1 → 2.1.2

package/dist/modules/auth/api/refreshUserToken/refreshToken.js

@@ -2,6 +2,7 @@ import { select } from '@evershop/postgres-query-builder';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { INVALID_PAYLOAD, UNAUTHORIZED } from '../../../../lib/util/httpStatus.js';
 import { generateToken, TOKEN_TYPES, verifyRefreshToken } from '../../../../lib/util/jwt.js';
+import { buildAdminUserPayload } from '../../services/buildAdminUserPayload.js';
 export default async (request, response, next) => {
     const { refreshToken } = request.body;
     if (!refreshToken) {
@@ -29,13 +30,10 @@ export default async (request, response, next) => {
                 }
             });
         }
-        // Generate new access token
-        const payload = decoded.user;
-        const newAccessToken = generateToken({
-            user: payload
-        }, TOKEN_TYPES.ADMIN);
+        // Generate new access token using fresh user data
+        const userPayload = buildAdminUserPayload(adminUser);
+        const newAccessToken = generateToken({ user: userPayload }, TOKEN_TYPES.ADMIN);
         return response.json({
-            success: true,
             data: {
                 accessToken: newAccessToken
             }

package/dist/modules/auth/api/refreshUserToken/refreshToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../../../src/modules/auth/api/refreshUserToken/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,WAAW,EACX,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AAErC,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YAC3C,KAAK,EAAE;gBACL,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,2BAA2B;aACrC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,uBAAuB;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACpE,4BAA4B;QAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,EAAE;aAC7B,IAAI,CAAC,YAAY,CAAC;aAClB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACvD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;aACrB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBACxC,KAAK,EAAE;oBACL,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,kCAAkC;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC;QAED,4BAA4B;QAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;QAC7B,MAAM,cAAc,GAAG,aAAa,CAClC;YACE,IAAI,EAAE,OAAO;SACd,EACD,WAAW,CAAC,KAAK,CAClB,CAAC;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB;aAClD;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"refreshToken.js","sourceRoot":"","sources":["../../../../../src/modules/auth/api/refreshUserToken/refreshToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EACL,eAAe,EACf,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,WAAW,EACX,kBAAkB,EACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAEhF,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YAC3C,KAAK,EAAE;gBACL,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,2BAA2B;aACrC;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,uBAAuB;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACpE,4BAA4B;QAC5B,MAAM,SAAS,GAAG,MAAM,MAAM,EAAE;aAC7B,IAAI,CAAC,YAAY,CAAC;aAClB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACvD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;aACrB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBACxC,KAAK,EAAE;oBACL,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,kCAAkC;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC;QAED,kDAAkD;QAClD,MAAM,WAAW,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,aAAa,CAClC,EAAE,IAAI,EAAE,WAAW,EAAE,EACrB,WAAW,CAAC,KAAK,CAClB,CAAC;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE;gBACJ,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACxC,KAAK,EAAE;gBACL,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB;aAClD;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/auth/bootstrap.d.ts

@@ -1,2 +1,2 @@
-declare function _default(): void;
+declare const _default: () => void;
 export default _default;

package/dist/modules/auth/bootstrap.js

@@ -1,25 +1,27 @@
 import { request } from 'express';
-import { hookable } from '../../lib/util/hookable.js';
 import { loginUserWithEmail } from './services/loginUserWithEmail.js';
 import { logoutUser } from './services/logoutUser.js';
 export default () => {
-    request.loginUserWithEmail = async function login(email, password, callback) {
-        await hookable(loginUserWithEmail.bind(this))(email, password);
-        if (this.session) {
-            this.session.save(callback);
-        }
-    };
+    request.loginUserWithEmail =
+        async function login(email, password, callback) {
+            await loginUserWithEmail.bind(this)(email, password);
+            if (this.session) {
+                this.session.save(callback);
+            }
+        };
     request.logoutUser = function logout(callback) {
-        hookable(logoutUser.bind(this))();
+        logoutUser.bind(this)();
         if (this.session) {
             this.session.save(callback);
         }
     };
-    request.isUserLoggedIn = function isUserLoggedIn() {
-        return !!this.session.userID;
-    };
-    request.getCurrentUser = function getCurrentUser() {
-        return this.locals.user;
-    };
+    request.isUserLoggedIn =
+        function isUserLoggedIn() {
+            return !!this.session.userID;
+        };
+    request.getCurrentUser =
+        function getCurrentUser() {
+            return this.locals.user;
+        };
 };
 //# sourceMappingURL=bootstrap.js.map

package/dist/modules/auth/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/auth/bootstrap.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,eAAe,GAAG,EAAE;IAClB,OAAO,CAAC,kBAAkB,GAAG,KAAK,UAAU,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QACzE,MAAM,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,UAAU,GAAG,SAAS,MAAM,CAAC,QAAQ;QAC3C,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,GAAG,SAAS,cAAc;QAC9C,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC,CAAC;IAEF,OAAO,CAAC,cAAc,GAAG,SAAS,cAAc;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/auth/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,eAAe,GAAG,EAAE;IACjB,OAAsC,CAAC,kBAAkB;QACxD,KAAK,UAAU,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;YAC5C,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC;IAEH,OAAsC,CAAC,UAAU,GAAG,SAAS,MAAM,CAClE,QAAQ;QAER,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAED,OAAsC,CAAC,cAAc;QACpD,SAAS,cAAc;YACrB,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC;IAEH,OAAsC,CAAC,cAAc;QACpD,SAAS,cAAc;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC;AACN,CAAC,CAAC"}

package/dist/modules/auth/services/buildAdminUserPayload.d.ts

@@ -0,0 +1,10 @@
+import type { AdminUserRow } from '../../../types/db/index.js';
+import type { CurrentUser } from '../../../types/request.js';
+/**
+ * Builds a safe CurrentUser payload from a raw AdminUserRow.
+ * Uses an explicit allowlist to ensure sensitive fields (e.g. password)
+ * are never included in JWT payloads or request locals.
+ */
+export declare function buildAdminUserPayload(adminUser: AdminUserRow & {
+    roles?: string;
+}): CurrentUser;

package/dist/modules/auth/services/buildAdminUserPayload.js

@@ -0,0 +1,19 @@
+/**
+ * Builds a safe CurrentUser payload from a raw AdminUserRow.
+ * Uses an explicit allowlist to ensure sensitive fields (e.g. password)
+ * are never included in JWT payloads or request locals.
+ */
+export function buildAdminUserPayload(adminUser) {
+    var _a;
+    return {
+        admin_user_id: adminUser.admin_user_id,
+        uuid: adminUser.uuid,
+        email: adminUser.email,
+        full_name: (_a = adminUser.full_name) !== null && _a !== void 0 ? _a : '',
+        status: adminUser.status ? 1 : 0,
+        roles: adminUser.roles || '*',
+        created_at: adminUser.created_at,
+        updated_at: adminUser.updated_at
+    };
+}
+//# sourceMappingURL=buildAdminUserPayload.js.map

package/dist/modules/auth/services/buildAdminUserPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildAdminUserPayload.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/buildAdminUserPayload.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAA4C;;IAE5C,OAAO;QACL,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,SAAS,EAAE,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE;QACpC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,GAAG;QAC7B,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,UAAU,EAAE,SAAS,CAAC,UAAU;KACjC,CAAC;AACJ,CAAC"}

package/dist/modules/auth/services/loginUserWithEmail.d.ts

@@ -1,7 +1,3 @@
-/**
- * This function will login the admin user with email and password. This function must be accessed from the request object (request.loginUserWithEmail(email, password, callback))
- * @param {string} email
- * @param {string} password
- */
-declare function loginUserWithEmail(email: string, password: string): Promise<void>;
-export { loginUserWithEmail };
+export declare function loginUserWithEmail(this: any, email: string, password: string): Promise<void>;
+export declare function hookBeforeLoginUserWithEmail(callback: (this: any, email: string, password: string) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterLoginUserWithEmail(callback: (this: any, email: string, password: string) => void | Promise<void>, priority?: number): void;

package/dist/modules/auth/services/loginUserWithEmail.js

@@ -1,12 +1,15 @@
 import { select } from '@evershop/postgres-query-builder';
 import { pool } from '../../../lib/postgres/connection.js';
+import { hookable, hookBefore, hookAfter } from '../../../lib/util/hookable.js';
 import { comparePassword } from '../../../lib/util/passwordHelper.js';
+import { buildAdminUserPayload } from './buildAdminUserPayload.js';
 /**
  * This function will login the admin user with email and password. This function must be accessed from the request object (request.loginUserWithEmail(email, password, callback))
  * @param {string} email
  * @param {string} password
  */
-async function loginUserWithEmail(email, password) {
+// Named function expression so .name === 'loginUserWithEmail' for the hookable key
+const _loginUserWithEmail = async function loginUserWithEmail(email, password) {
     // Escape the email to prevent SQL injection
     const userEmail = email.replace(/%/g, '\\%');
     const user = await select()
@@ -21,10 +24,16 @@ async function loginUserWithEmail(email, password) {
     if (this.session) {
         this.session.userID = user.admin_user_id;
     }
-    // Delete the password field
-    delete user.password;
-    // Save the user in the request
-    this.locals.user = user;
+    // Save the user in the request using a safe payload (no password)
+    this.locals.user = buildAdminUserPayload(user);
+};
+export async function loginUserWithEmail(email, password) {
+    await hookable(_loginUserWithEmail.bind(this))(email, password);
+}
+export function hookBeforeLoginUserWithEmail(callback, priority = 10) {
+    hookBefore('loginUserWithEmail', callback, priority);
+}
+export function hookAfterLoginUserWithEmail(callback, priority = 10) {
+    hookAfter('loginUserWithEmail', callback, priority);
 }
-export { loginUserWithEmail };
 //# sourceMappingURL=loginUserWithEmail.js.map

package/dist/modules/auth/services/loginUserWithEmail.js.map

@@ -1 +1 @@
-{"version":3,"file":"loginUserWithEmail.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/loginUserWithEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAEtE;;;;GAIG;AACH,KAAK,UAAU,kBAAkB,CAC/B,KAAa,EACb,QAAgB;IAEhB,4CAA4C;IAC5C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE;SACxB,IAAI,CAAC,YAAY,CAAC;SAClB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC;SAClC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;SACrB,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;IAC3C,CAAC;IACD,4BAA4B;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC;IACrB,+BAA+B;IAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;AAC1B,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"loginUserWithEmail.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/loginUserWithEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE;;;;GAIG;AACH,mFAAmF;AACnF,MAAM,mBAAmB,GAAG,KAAK,UAAU,kBAAkB,CAE3D,KAAa,EACb,QAAgB;IAEhB,4CAA4C;IAC5C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAG,MAAM,MAAM,EAAE;SACxB,IAAI,CAAC,YAAY,CAAC;SAClB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC;SAClC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;SACrB,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;IAC3C,CAAC;IACD,kEAAkE;IAClE,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAEtC,KAAa,EACb,QAAgB;IAEhB,MAAM,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,QAIyB,EACzB,WAAmB,EAAE;IAErB,UAAU,CAAC,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,QAIyB,EACzB,WAAmB,EAAE;IAErB,SAAS,CAAC,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC"}

package/dist/modules/auth/services/logoutUser.d.ts

@@ -1,4 +1,3 @@
-/**
- * Logout a current user. This function must be accessed from the request object (request.logoutUser(callback))
- */
-export declare function logoutUser(): void;
+export declare function logoutUser(this: any): void;
+export declare function hookBeforeLogoutUser(callback: (this: any) => void | Promise<void>, priority?: number): void;
+export declare function hookAfterLogoutUser(callback: (this: any) => void | Promise<void>, priority?: number): void;

package/dist/modules/auth/services/logoutUser.js

@@ -1,8 +1,19 @@
+import { hookable, hookBefore, hookAfter } from '../../../lib/util/hookable.js';
 /**
  * Logout a current user. This function must be accessed from the request object (request.logoutUser(callback))
  */
-export function logoutUser() {
+// Named function expression so .name === 'logoutUser' for the hookable key
+const _logoutUser = function logoutUser() {
     this.session.userID = undefined;
     this.locals.user = undefined;
+};
+export function logoutUser() {
+    hookable(_logoutUser.bind(this))();
+}
+export function hookBeforeLogoutUser(callback, priority = 10) {
+    hookBefore('logoutUser', callback, priority);
+}
+export function hookAfterLogoutUser(callback, priority = 10) {
+    hookAfter('logoutUser', callback, priority);
 }
 //# sourceMappingURL=logoutUser.js.map

package/dist/modules/auth/services/logoutUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"logoutUser.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/logoutUser.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"logoutUser.js","sourceRoot":"","sources":["../../../../src/modules/auth/services/logoutUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAEhF;;GAEG;AACH,2EAA2E;AAC3E,MAAM,WAAW,GAAG,SAAS,UAAU;IACrC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAChC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,UAAU,UAAU;IACxB,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,QAA6C,EAC7C,WAAmB,EAAE;IAErB,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,QAA6C,EAC7C,WAAmB,EAAE;IAErB,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC"}

package/dist/modules/base/api/global/[apiResponse]apiErrorHandler.d.ts

@@ -1,2 +1,4 @@
-declare function _default(err: any, request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (err: any, request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/base/api/global/[apiResponse]apiErrorHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"[apiResponse]apiErrorHandler.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[apiResponse]apiErrorHandler.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAE1E,eAAe,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACpD,IAAI,iBAAiB,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IACD,8CAA8C;IAC9C,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,6CAA6C;IAC/C,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,GAAG,qBAAqB,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;YACxD,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;QAC/B,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM;gBACN,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[apiResponse]apiErrorHandler.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[apiResponse]apiErrorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAI1E,eAAe,KAAK,EAClB,GAAG,EACH,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,iBAAiB,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IACD,8CAA8C;IAC9C,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzB,6CAA6C;IAC/C,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,GAAG,qBAAqB,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;YACxD,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;QAC/B,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE;gBACL,MAAM;gBACN,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/base/api/global/[auth]apiResponse[apiErrorHandler].d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/base/api/global/[auth]apiResponse[apiErrorHandler].js.map

@@ -1 +1 @@
-{"version":3,"file":"[auth]apiResponse[apiErrorHandler].js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[auth]apiResponse[apiErrorHandler].js"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,MAAM,uDAAuD,CAAC;AAE5F,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,IAAI,CAAC;QACH,4EAA4E;QAC5E,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,0DAA0D;YAC1D,8CAA8C;QAChD,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[auth]apiResponse[apiErrorHandler].js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[auth]apiResponse[apiErrorHandler].ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,MAAM,uDAAuD,CAAC;AAI5F,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,CAAC;QACH,4EAA4E;QAC5E,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,0DAA0D;YAC1D,8CAA8C;QAChD,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/base/api/global/[auth]payloadValidate.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): void;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => void;
 export default _default;

package/dist/modules/base/api/global/[auth]payloadValidate.js

@@ -1,4 +1,5 @@
 import { INVALID_PAYLOAD } from '../../../../lib/util/httpStatus.js';
+import { getValueSync } from '../../../../lib/util/registry.js';
 import { getAjv } from '../../services/getAjv.js';
 import markSkipEscape from '../../services/markSkipEscape.js';
 // Initialize the ajv instance
@@ -9,7 +10,7 @@ ajv.addKeyword({
     modifying: true,
     compile(sch, parentSchema) {
         return (data, t) => {
-            if (parentSchema.type === 'string' && sch === true) {
+            if (sch === true) {
                 // Mark the data as skip escape
                 markSkipEscape(t.rootData, t.instancePath);
                 return true;
@@ -24,7 +25,7 @@ export default (request, response, next) => {
     // Get the current route
     const { currentRoute } = request;
     // Get the payload schema
-    const { payloadSchema } = currentRoute;
+    const payloadSchema = getValueSync('payloadSchema', currentRoute.payloadSchema, { route: currentRoute });
     if (!payloadSchema) {
         next();
     }

package/dist/modules/base/api/global/[auth]payloadValidate.js.map

@@ -1 +1 @@
-{"version":3,"file":"[auth]payloadValidate.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[auth]payloadValidate.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAE9D,8BAA8B;AAC9B,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;AACrB,0CAA0C;AAC1C,GAAG,CAAC,UAAU,CAAC;IACb,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,IAAI;IACf,OAAO,CAAC,GAAG,EAAE,YAAY;QACvB,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACjB,IAAI,YAAY,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACnD,+BAA+B;gBAC/B,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC3C,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,wBAAwB;IACxB,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,yBAAyB;IACzB,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC;IACvC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;iBACpC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[auth]payloadValidate.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[auth]payloadValidate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAE9D,8BAA8B;AAC9B,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;AACrB,0CAA0C;AAC1C,GAAG,CAAC,UAAU,CAAC;IACb,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,IAAI;IACf,OAAO,CAAC,GAAG,EAAE,YAAY;QACvB,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACjB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,+BAA+B;gBAC/B,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;gBAC3C,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,CAAC,OAAwB,EAAE,QAA0B,EAAE,IAAI,EAAE,EAAE;IAC5E,wBAAwB;IACxB,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,yBAAyB;IACzB,MAAM,aAAa,GAAG,YAAY,CAChC,eAAe,EACf,YAAY,CAAC,aAAa,EAC1B,EAAE,KAAK,EAAE,YAAY,EAAE,CACxB,CAAC;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,EAAE,CAAC;QACT,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE;oBACL,MAAM,EAAE,eAAe;oBACvB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO;iBACpC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/base/api/global/[payloadValidate]escapeHtml.d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): void;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => void;
 export default _default;

package/dist/modules/base/api/global/[payloadValidate]escapeHtml.js

@@ -1,11 +1,9 @@
 import escapePayload from '../../services/escapePayload.js';
 export default (request, response, next) => {
-    // return next();
     if (request.method === 'GET') {
         next();
     }
     else {
-        // Escape the characters <, > from the payload
         escapePayload(request.body);
         next();
     }

package/dist/modules/base/api/global/[payloadValidate]escapeHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"[payloadValidate]escapeHtml.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[payloadValidate]escapeHtml.js"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAE5D,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,iBAAiB;IACjB,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,8CAA8C;QAC9C,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,EAAE,CAAC;IACT,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[payloadValidate]escapeHtml.js","sourceRoot":"","sources":["../../../../../src/modules/base/api/global/[payloadValidate]escapeHtml.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAE5D,eAAe,CAAC,OAAwB,EAAE,QAA0B,EAAE,IAAI,EAAE,EAAE;IAC5E,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,EAAE,CAAC;IACT,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/base/migration/Version-1.0.2.d.ts

@@ -0,0 +1,2 @@
+declare function _default(connection: any): Promise<void>;
+export default _default;

package/dist/modules/base/migration/Version-1.0.2.js

@@ -0,0 +1,22 @@
+import { execute } from '@evershop/postgres-query-builder';
+export default async (connection) => {
+    // Add status column for reliable queue processing
+    await execute(connection, `ALTER TABLE "event"
+      ADD COLUMN "status" varchar NOT NULL DEFAULT 'pending',
+      ADD COLUMN "started_at" TIMESTAMP WITH TIME ZONE,
+      ADD COLUMN "completed_at" TIMESTAMP WITH TIME ZONE`);
+    // Index for efficient polling: only scan pending rows
+    await execute(connection, `CREATE INDEX "EVENT_STATUS_IDX" ON "event" ("status", "event_id" ASC)`);
+    // Notify function: fires pg_notify on every new event insert so the
+    // event-manager can wake up immediately instead of waiting for the poll cycle
+    await execute(connection, `CREATE OR REPLACE FUNCTION notify_new_event() RETURNS trigger AS $$
+BEGIN
+  PERFORM pg_notify('new_event', NEW.name);
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql`);
+    await execute(connection, `CREATE TRIGGER event_inserted
+      AFTER INSERT ON "event"
+      FOR EACH ROW EXECUTE FUNCTION notify_new_event()`);
+};
+//# sourceMappingURL=Version-1.0.2.js.map

package/dist/modules/base/migration/Version-1.0.2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Version-1.0.2.js","sourceRoot":"","sources":["../../../../src/modules/base/migration/Version-1.0.2.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,eAAe,KAAK,EAAE,UAAU,EAAE,EAAE;IAClC,kDAAkD;IAClD,MAAM,OAAO,CACX,UAAU,EACV;;;yDAGqD,CACtD,CAAC;IAEF,sDAAsD;IACtD,MAAM,OAAO,CACX,UAAU,EACV,uEAAuE,CACxE,CAAC;IAEF,oEAAoE;IACpE,8EAA8E;IAC9E,MAAM,OAAO,CACX,UAAU,EACV;;;;;oBAKgB,CACjB,CAAC;IAEF,MAAM,OAAO,CACX,UAAU,EACV;;uDAEmD,CACpD,CAAC;AACJ,CAAC,CAAC"}

package/dist/modules/base/pages/admin/all/global.scss

@@ -13,7 +13,7 @@ body {
   left: 0;
   background-color: #fff;
   box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.15);
-  z-index: 45;
+  z-index: 1000;
 }
 .content-wrapper {
   margin-top: 3.5rem;

package/dist/modules/base/services/escapePayload.js

@@ -8,25 +8,32 @@ function escapeHtmlTags(str) {
     return str.replace(regex, (match) => match.replace(/[<>&"']/g, (char) => replacements[char] || char));
 }
 export default function escapePayload(obj) {
+    if (obj === null || typeof obj !== 'object') {
+        return;
+    }
+    if (Array.isArray(obj)) {
+        obj.forEach((item) => escapePayload(item));
+        return;
+    }
+    // Fields registered on this object to skip HTML escaping
+    const skipFields = Array.isArray(obj[secret]) ? obj[secret] : [];
     for (const prop in obj) {
+        // Skip the secret marker itself
+        if (prop === secret)
+            continue;
+        // Skip fields explicitly marked to bypass escaping
+        if (skipFields.includes(prop))
+            continue;
         if (typeof obj[prop] === 'string') {
-            // Check if we found the secret string at the end of value
-            if (obj[prop].endsWith(secret)) {
-                // Remove the secret keyword from the value
-                obj[prop] = obj[prop].replace(secret, '');
-            }
-            else {
-                obj[prop] = escapeHtmlTags(obj[prop]);
-            }
+            obj[prop] = escapeHtmlTags(obj[prop]);
+        }
+        else if (Array.isArray(obj[prop])) {
+            obj[prop].forEach((item) => escapePayload(item));
         }
         else if (typeof obj[prop] === 'object' && obj[prop] !== null) {
             escapePayload(obj[prop]);
         }
-        else if (Array.isArray(obj[prop])) {
-            obj[prop].forEach((item) => {
-                escapePayload(item);
-            });
-        }
     }
+    delete obj[secret];
 }
 //# sourceMappingURL=escapePayload.js.map

package/dist/modules/base/services/escapePayload.js.map

@@ -1 +1 @@
-{"version":3,"file":"escapePayload.js","sourceRoot":"","sources":["../../../../src/modules/base/services/escapePayload.js"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,0CAA0C,CAAC;AAE9D,SAAS,cAAc,CAAC,GAAG;IACzB,MAAM,KAAK,GAAG,4CAA4C,CAAC;IAC3D,MAAM,YAAY,GAAG;QACnB,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;KACZ,CAAC;IACF,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAClC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAChE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,GAAG;IACvC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,0DAA0D;YAC1D,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/B,2CAA2C;gBAC3C,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC/D,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzB,aAAa,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"escapePayload.js","sourceRoot":"","sources":["../../../../src/modules/base/services/escapePayload.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,0CAA0C,CAAC;AAE9D,SAAS,cAAc,CAAC,GAAG;IACzB,MAAM,KAAK,GAAG,4CAA4C,CAAC;IAC3D,MAAM,YAAY,GAAG;QACnB,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;KACZ,CAAC;IACF,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAClC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAChE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,GAAG;IACvC,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO;IACT,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IACD,yDAAyD;IACzD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,gCAAgC;QAChC,IAAI,IAAI,KAAK,MAAM;YAAE,SAAS;QAC9B,mDAAmD;QACnD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS;QACxC,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACpC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC/D,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC"}

package/dist/modules/base/services/markSkipEscape.d.ts

@@ -1 +1,6 @@
+/**
+ * Marks a field on its parent object to skip HTML escaping.
+ * Adds a special property keyed by `secret` to the parent object,
+ * whose value is an array of field names that should not be escaped.
+ */
 export default function markSkipEscape(obj: any, path: any): void;

package/dist/modules/base/services/markSkipEscape.js

@@ -1,32 +1,37 @@
 import secret from './secret.js';
+/**
+ * Marks a field on its parent object to skip HTML escaping.
+ * Adds a special property keyed by `secret` to the parent object,
+ * whose value is an array of field names that should not be escaped.
+ */
 export default function markSkipEscape(obj, path) {
-    const keys = path.split('/');
+    const keys = path.split('/').filter((k) => k !== '');
+    if (keys.length === 0) {
+        return;
+    }
     let result = obj;
     const lastKeyIndex = keys.length - 1;
     for (let i = 0; i < lastKeyIndex; i += 1) {
         const key = keys[i];
-        if (key === '') {
-            continue;
-        }
-        const match = key.match(/(.+)\[(\d+)\]/);
-        if (match) {
-            const prop = match[1];
-            const index = parseInt(match[2], 10);
-            result = result[prop][index];
-        }
-        else {
-            result = result[key];
+        if (result == null || typeof result !== 'object') {
+            return;
         }
+        result = result[key];
     }
-    const lastKey = keys[lastKeyIndex];
-    const lastMatch = lastKey.match(/(.+)\[(\d+)\]/);
-    if (lastMatch) {
-        const prop = lastMatch[1];
-        const index = parseInt(lastMatch[2], 10);
-        result[prop][index] += secret;
+    if (result == null || typeof result !== 'object') {
+        return;
+    }
+    if (!Array.isArray(result[secret])) {
+        Object.defineProperty(result, secret, {
+            value: [],
+            enumerable: false,
+            configurable: true,
+            writable: true
+        });
     }
-    else {
-        result[lastKey] += secret;
+    const lastKey = keys[lastKeyIndex];
+    if (!result[secret].includes(lastKey)) {
+        result[secret].push(lastKey);
     }
 }
 //# sourceMappingURL=markSkipEscape.js.map

package/dist/modules/base/services/markSkipEscape.js.map

@@ -1 +1 @@
-{"version":3,"file":"markSkipEscape.js","sourceRoot":"","sources":["../../../../src/modules/base/services/markSkipEscape.js"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,GAAG,EAAE,IAAI;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACzC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACrC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACnC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACjD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC;IAChC,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC;IAC5B,CAAC;AACH,CAAC"}
+{"version":3,"file":"markSkipEscape.js","sourceRoot":"","sources":["../../../../src/modules/base/services/markSkipEscape.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,GAAG,EAAE,IAAI;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAErC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,MAAM,IAAI,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjD,OAAO;QACT,CAAC;QACD,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,MAAM,IAAI,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACjD,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACnC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE;YACpC,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC"}

package/dist/modules/catalog/api/createAttribute/createAttribute[finish].d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any): Promise<any>;
+declare function _default(request: any, response: any): Promise<import("../../../../types/db/index.js").AttributeRow & {
+    insertId: number;
+}>;
 export default _default;

package/dist/modules/catalog/api/createCategory/[context]bodyParser[auth].d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => void;
 export default _default;

package/dist/modules/catalog/api/createCategory/[context]bodyParser[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/[context]bodyParser[auth].js"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}
+{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/[context]bodyParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}

package/dist/modules/catalog/api/createCategory/createCategory[finish].d.ts

@@ -1,2 +1,6 @@
-declare function _default(request: any, response: any): Promise<any>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse) => Promise<import("../../../../types/db/index.js").CategoryRow & import("../../../../types/db/index.js").CategoryDescriptionRow & {
+    insertId: number;
+}>;
 export default _default;

package/dist/modules/catalog/api/createCategory/createCategory[finish].js.map

@@ -1 +1 @@
-{"version":3,"file":"createCategory[finish].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/createCategory[finish].js"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2CAA2C,CAAC;AAEvE,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACzC,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE;QAChD,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE;KACjC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"createCategory[finish].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/createCategory[finish].ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,2CAA2C,CAAC;AAEvE,eAAe,KAAK,EAAE,OAAwB,EAAE,QAA0B,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE;QAChD,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE;KACjC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/modules/catalog/api/createCategory/finish[apiResponse].d.ts

@@ -1,2 +1,4 @@
-declare function _default(request: any, response: any, next: any): Promise<void>;
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
 export default _default;

package/dist/modules/catalog/api/createCategory/finish[apiResponse].js

@@ -16,13 +16,13 @@ export default async (request, response, next) => {
                 },
                 {
                     rel: 'view',
-                    href: buildUrl('categoryView', { uuid: category.uuid }),
+                    href: buildUrl('categoryView', { uuid: category === null || category === void 0 ? void 0 : category.uuid }),
                     action: 'GET',
                     types: ['text/xml']
                 },
                 {
                     rel: 'edit',
-                    href: buildUrl('categoryEdit', { id: category.uuid }),
+                    href: buildUrl('categoryEdit', { id: category === null || category === void 0 ? void 0 : category.uuid }),
                     action: 'GET',
                     types: ['text/xml']
                 }

package/dist/modules/catalog/api/createCategory/finish[apiResponse].js.map

@@ -1 +1 @@
-{"version":3,"file":"finish[apiResponse].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/finish[apiResponse].js"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,oCAAoC,CAAC;AAExD,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC9D,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE;YACJ,GAAG,QAAQ;YACX,KAAK,EAAE;gBACL;oBACE,GAAG,EAAE,cAAc;oBACnB,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC;oBAC9B,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACvD,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACrD,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"finish[apiResponse].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCategory/finish[apiResponse].ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,oCAAoC,CAAC;AAIxD,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,gBAAgB,EAChB,OAAO,CACR,CAAC;IACF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE;YACJ,GAAG,QAAQ;YACX,KAAK,EAAE;gBACL;oBACE,GAAG,EAAE,cAAc;oBACnB,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC;oBAC9B,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC;oBACxD,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC;oBACtD,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}