@evershop/evershop 2.1.0 → 2.1.2

package/dist/modules/base/pages/frontStore/all/shadcn.css

@@ -0,0 +1,95 @@
+@theme inline {
+  @keyframes accordion-down {
+    from {
+      height: 0;
+    }
+    to {
+      height: var(
+        --radix-accordion-content-height,
+        var(--accordion-panel-height, auto)
+      );
+    }
+  }
+
+  @keyframes accordion-up {
+    from {
+      height: var(
+        --radix-accordion-content-height,
+        var(--accordion-panel-height, auto)
+      );
+    }
+    to {
+      height: 0;
+    }
+  }
+}
+
+/* Custom variants */
+@custom-variant data-open {
+  &:where([data-state='open']),
+  &:where([data-open]:not([data-open='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-closed {
+  &:where([data-state='closed']),
+  &:where([data-closed]:not([data-closed='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-checked {
+  &:where([data-state='checked']),
+  &:where([data-checked]:not([data-checked='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-unchecked {
+  &:where([data-state='unchecked']),
+  &:where([data-unchecked]:not([data-unchecked='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-selected {
+  &:where([data-selected='true']) {
+    @slot;
+  }
+}
+
+@custom-variant data-disabled {
+  &:where([data-disabled='true']),
+  &:where([data-disabled]:not([data-disabled='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-active {
+  &:where([data-state='active']),
+  &:where([data-active]:not([data-active='false'])) {
+    @slot;
+  }
+}
+
+@custom-variant data-horizontal {
+  &:where([data-orientation='horizontal']) {
+    @slot;
+  }
+}
+
+@custom-variant data-vertical {
+  &:where([data-orientation='vertical']) {
+    @slot;
+  }
+}
+
+@utility no-scrollbar {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}

package/dist/modules/base/pages/frontStore/all/tailwind.css

@@ -0,0 +1,120 @@
+@import 'tailwindcss';
+@plugin "@tailwindcss/typography";
+@import 'tw-animate-css';
+@import './shadcn.css';
+
+@custom-variant dark (&:is(.dark *));
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --font-sans: var(--font-sans);
+  --font-mono: var(--font-geist-mono);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar: var(--sidebar);
+  --color-chart-5: var(--chart-5);
+  --color-chart-4: var(--chart-4);
+  --color-chart-3: var(--chart-3);
+  --color-chart-2: var(--chart-2);
+  --color-chart-1: var(--chart-1);
+  --color-ring: var(--ring);
+  --color-input: var(--input);
+  --color-border: var(--border);
+  --color-divider: var(--divider);
+  --color-destructive: var(--destructive);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-accent: var(--accent);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-muted: var(--muted);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-secondary: var(--secondary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-primary: var(--primary);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-popover: var(--popover);
+  --color-card-foreground: var(--card-foreground);
+  --color-card: var(--card);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --radius-2xl: calc(var(--radius) + 8px);
+  --radius-3xl: calc(var(--radius) + 12px);
+  --radius-4xl: calc(var(--radius) + 16px);
+}
+
+:root {
+  --radius: 0.325rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.205 0 0);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.97 0 0);
+  --secondary-foreground: oklch(0.205 0 0);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.922 0 0);
+  --divider: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.145 0 0);
+  --sidebar-primary: oklch(0.205 0 0);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.97 0 0);
+  --sidebar-accent-foreground: oklch(0.205 0 0);
+  --sidebar-border: oklch(0.922 0 0);
+  --sidebar-ring: oklch(0.708 0 0);
+}
+
+.dark {
+  --background: oklch(0.145 0 0);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.205 0 0);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.205 0 0);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.922 0 0);
+  --primary-foreground: oklch(0.205 0 0);
+  --secondary: oklch(0.269 0 0);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.269 0 0);
+  --muted-foreground: oklch(0.708 0 0);
+  --accent: oklch(0.269 0 0);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.556 0 0);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.205 0 0);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.269 0 0);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.556 0 0);
+}

package/dist/modules/base/pages/global/[auth]notFound[response].js

@@ -1,10 +1,19 @@
 import { translate } from '../../../../lib/locale/translate/translate.js';
+import { getRoutes } from '../../../../lib/router/Router.js';
 import { setPageMetaInfo } from '../../../cms/services/pageMetaInfo.js';
 export default async (request, response, next) => {
+    var _a;
     if (response.statusCode !== 404) {
         next();
     }
     else {
+        const routes = getRoutes();
+        if ((_a = request.currentRoute) === null || _a === void 0 ? void 0 : _a.isAdmin) {
+            request.currentRoute = routes.find((r) => r.id === 'adminNotFound');
+        }
+        else {
+            request.currentRoute = routes.find((r) => r.id === 'notFound');
+        }
         setPageMetaInfo(request, {
             title: translate('Not found'),
             description: translate('Page not found')

package/dist/modules/base/pages/global/[auth]notFound[response].js.map

@@ -1 +1 @@
-{"version":3,"file":"[auth]notFound[response].js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/[auth]notFound[response].ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;QAChC,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,eAAe,CAAC,OAAO,EAAE;YACvB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC;YAC7B,WAAW,EAAE,SAAS,CAAC,gBAAgB,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"[auth]notFound[response].js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/[auth]notFound[response].ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;;IAC/C,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;QAChC,IAAI,EAAE,CAAC;IACT,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,IAAI,MAAA,OAAO,CAAC,YAAY,0CAAE,OAAO,EAAE,CAAC;YAClC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,eAAe,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,eAAe,CAAC,OAAO,EAAE;YACvB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC;YAC7B,WAAW,EAAE,SAAS,CAAC,gBAAgB,CAAC;SACzC,CAAC,CAAC;QACH,IAAI,EAAE,CAAC;IACT,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/base/pages/global/context.js

@@ -1,4 +1,5 @@
 import { pool } from '../../../../lib/postgres/connection.js';
+import { getBaseUrl } from '../../../../lib/util/getBaseUrl.js';
 import { getConfig } from '../../../../lib/util/getConfig.js';
 import { setPageMetaInfo } from '../../../cms/services/pageMetaInfo.js';
 import { hasContextValue, setContextValue } from '../../../graphql/services/contextHelper.js';
@@ -9,7 +10,7 @@ export default (request, response) => {
         setContextValue(request.app, 'pool', pool);
     }
     setContextValue(request, 'pool', pool);
-    const homeUrl = getConfig('shop.homeUrl', `${request.protocol}://${request.get('host')}`);
+    const homeUrl = getBaseUrl();
     setContextValue(request.app, 'homeUrl', homeUrl);
     setPageMetaInfo(request, {
         baseUrl: homeUrl

package/dist/modules/base/pages/global/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/context.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/context.js"],"names":[],"mappings":"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"}

package/dist/modules/base/pages/global/response[errorHandler].js

@@ -30,9 +30,13 @@ export default async (request, response, next) => {
                 setPageMetaInfo(request, {
                     route: {
                         id: route.id,
+                        isAdmin: route.isAdmin,
                         path: route.path,
                         url: getContextValue(request, 'currentUrl'),
-                        params: request.params
+                        params: Object.fromEntries(Object.entries(request.params).map(([key, value]) => [
+                            key,
+                            Array.isArray(value) ? value[0] : value
+                        ]))
                     }
                 });
                 let widgetInstances;

package/dist/modules/base/pages/global/response[errorHandler].js.map

@@ -1 +1 @@
-{"version":3,"file":"response[errorHandler].js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/response[errorHandler].ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"response[errorHandler].js","sourceRoot":"","sources":["../../../../../src/modules/base/pages/global/response[errorHandler].ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,MAAM,uDAAuD,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EACL,eAAe,EACf,eAAe,EAChB,MAAM,kDAAkD,CAAC;AAG1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,eAAe,KAAK,EAAE,OAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAChE,IAAI,CAAC;QACH,4EAA4E;QAC5E,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;YAEnC,iHAAiH;YACjH,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;gBAC5C,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,OAAO,CAAC,KAAK,GAAG;oBACvB,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC;gBACF,eAAe,CAAC,OAAO,EAAE;oBACvB,KAAK,EAAE;wBACL,EAAE,EAAE,KAAK,CAAC,EAAE;wBACZ,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,GAAG,EAAE,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC;wBAC3C,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;4BACnD,GAAG;4BACH,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;yBACxC,CAAC,CACH;qBACF;iBACF,CAAC,CAAC;gBACH,IAAI,eAAe,CAAC;gBACpB,mCAAmC;gBACnC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;oBACpC,eAAe,GAAG,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACN,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;gBACvD,CAAC;gBACD,eAAe,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC/C,MAAM,SAAS,GAAG;wBAChB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,EAAE,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE;qBACxC,CAAC;oBACF,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;wBAClB,SAAS,CAAC,MAAM,GAAG,qBAAqB,CAAC;oBAC3C,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,MAAM,CAAC,OAAO,GAAG,eAAe,CAAC;gBAC1C,IACE,CAAC,iBAAiB,EAAE;oBAClB,OAAO,CAAC,KAAK;oBACb,OAAO,CAAC,KAAK,CAAC,WAAW,KAAK,MAAM,CAAC;oBACvC,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,EAChD,CAAC;oBACD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;oBAC1C,MAAM,SAAS,GAAG,YAAY,CAC5B,WAAW,EACX;wBACE,GAAG,EAAE;4BACH,iBAAiB,EAAE,SAAS,CAC1B,iCAAiC,EACjC,KAAK,CACN;yBACF;wBACD,OAAO,EAAE;4BACP,eAAe,EAAE;gCACf,KAAK,EAAE,SAAS,CAAC,6BAA6B,EAAE,IAAI,CAAC;gCACrD,MAAM,EAAE,SAAS,CAAC,8BAA8B,EAAE,IAAI,CAAC;6BACxD;yBACF;wBACD,QAAQ,EAAE,QAAQ;qBACnB,EACD,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAC9D,CAAC;oBACF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAE1D,QAAQ,CAAC,IAAI,CAAC;wBACZ,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE;4BACR,eAAe,EAAE,GAAG,CAClB,QAAQ,EACR,wBAAwB,EACxB,EAAE,CACH;4BACD,MAAM,EAAE,MAAM;4BACd,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,CAAC;4BAC9C,OAAO,EAAE,eAAe;yBACD;qBAC1B,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,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/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"}

package/dist/modules/catalog/api/createCategory/payloadSchema.json

@@ -0,0 +1,76 @@
+{
+  "type": "object",
+  "properties": {
+    "description": {
+      "type": "array",
+      "skipEscape": true,
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "errorMessage": {
+              "type": "Description block ID must be a string"
+            }
+          },
+          "size": {
+            "type": "number",
+            "errorMessage": {
+              "type": "Description block size must be a number"
+            }
+          },
+          "columns": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string",
+                  "errorMessage": {
+                    "type": "Column ID must be a string"
+                  }
+                },
+                "size": {
+                  "type": "number",
+                  "errorMessage": {
+                    "type": "Column size must be a number"
+                  }
+                },
+                "data": {
+                  "type": "object",
+                  "errorMessage": {
+                    "type": "Column data must be an object"
+                  }
+                }
+              },
+              "required": ["id", "size", "data"],
+              "errorMessage": {
+                "required": {
+                  "id": "Column ID is required",
+                  "size": "Column size is required",
+                  "data": "Column data is required"
+                }
+              }
+            },
+            "errorMessage": {
+              "type": "Columns must be an array"
+            }
+          }
+        },
+        "required": ["id", "size", "columns"],
+        "errorMessage": {
+          "required": {
+            "id": "Description block ID is required",
+            "size": "Description block size is required",
+            "columns": "Description block columns are required"
+          }
+        }
+      },
+      "default": [],
+      "errorMessage": {
+        "type": "Description must be an array"
+      }
+    }
+  },
+  "additionalProperties": true
+}

package/dist/modules/catalog/api/createCollection/[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/createCollection/[context]bodyParser[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCollection/[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/createCollection/[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/createCollection/createCollection[finish].d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"createCollection[finish].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCollection/createCollection[finish].js"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,+CAA+C,CAAC;AAE7E,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IACzC,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE;QACtD,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE;KACjC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
+{"version":3,"file":"createCollection[finish].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCollection/createCollection[finish].ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,+CAA+C,CAAC;AAE7E,eAAe,KAAK,EAAE,OAAwB,EAAE,QAAQ,EAAE,EAAE;IAC1D,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE;QACtD,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE;KACjC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}

package/dist/modules/catalog/api/createCollection/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/createCollection/finish[apiResponse].js

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

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

@@ -1 +1 @@
-{"version":3,"file":"finish[apiResponse].js","sourceRoot":"","sources":["../../../../../src/modules/catalog/api/createCollection/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,UAAU,GAAG,MAAM,WAAW,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAClE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE;YACJ,GAAG,UAAU;YACb,KAAK,EAAE;gBACL;oBACE,GAAG,EAAE,gBAAgB;oBACrB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC;oBAChC,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;oBACzD,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/createCollection/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,UAAU,GAAG,MAAM,WAAW,CAClC,kBAAkB,EAClB,OAAO,CACR,CAAC;IACF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpB,QAAQ,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE;YACJ,GAAG,UAAU;YACb,KAAK,EAAE;gBACL;oBACE,GAAG,EAAE,gBAAgB;oBACrB,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC;oBAChC,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;gBACD;oBACE,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,QAAQ,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,EAAE,CAAC;oBAC1D,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB;aACF;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}