@jetshop/core 5.17.0-alpha.63e16fd6 → 5.17.0-alpha.72f771f3

package/boot/server/entrypoint.js

@@ -13,12 +13,12 @@ import http from 'http';
     const server = http.createServer(app);
     let currentApp = app;
     server.listen(process.env.PORT || 3000, () => {
-        console.log('🚀 started');
+        console.log('🚀 Started');
     });
     if (module.hot) {
-        console.log('✅  Server-side HMR Enabled!');
+        console.log('🟢 HMR Server-side enabled!');
         const reload = () => __awaiter(void 0, void 0, void 0, function* () {
-            console.log('📦  Server-side HMR Reloaded');
+            console.log('📦 HMR Server-side reloaded');
             try {
                 app = yield require('src/server').default;
                 server.removeListener('request', currentApp);
@@ -26,12 +26,13 @@ import http from 'http';
                 currentApp = app;
             }
             catch (error) {
+                console.log('🔥 HMR Error: ', (error === null || error === void 0 ? void 0 : error.stack) || error);
                 console.error(error);
             }
         });
         // Reload on HMR
         module.hot.accept('src/server', reload, (err) => {
-            console.log('HMR err ', err);
+            console.log('🔥 HMR Error: ', err);
         });
     }
 }))();

package/boot/server/entrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["entrypoint.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,GAAS,EAAE;IACV,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,UAAU,GAAG,GAAG,CAAC;IAErB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,GAAG,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAK,MAAc,CAAC,GAAG,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,GAAS,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAE5C,IAAI;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;gBAC1C,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAC1B,UAAU,GAAG,GAAG,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;QACH,CAAC,CAAA,CAAC;QAEF,gBAAgB;QACf,MAAc,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YACvD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
+{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["entrypoint.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,GAAS,EAAE;IACV,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,UAAU,GAAG,GAAG,CAAC;IAErB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,GAAG,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAK,MAAc,CAAC,GAAG,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,GAAS,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAE3C,IAAI;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;gBAC1C,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAC1B,UAAU,GAAG,GAAG,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,KAAI,KAAK,CAAC,CAAC;gBACrD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;QACH,CAAC,CAAA,CAAC;QAEF,gBAAgB;QACf,MAAc,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YACvD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/cart/useAddToCart.d.ts

@@ -70,7 +70,7 @@ export declare function useAddToCart({ product, variant, submit, commentValidato
         dirty: boolean;
         unregisterField: (name: string) => void;
         registerField: (name: string, { validate }: any) => void;
-        getFieldProps: (nameOrOptions: any) => import("formik").FieldInputProps<any>;
+        getFieldProps: (nameOrOptions: string | import("formik").FieldConfig<any>) => import("formik").FieldInputProps<any>;
         getFieldMeta: (name: string) => import("formik").FieldMetaProps<any>;
         getFieldHelpers: (name: string) => import("formik").FieldHelperProps<any>;
         validateOnBlur: boolean;

package/components/Auth/ForgotPasswordProvider.d.ts

@@ -26,7 +26,7 @@ export declare function useForgotPasswordData(): {
     setSubmitting: (isSubmitting: boolean) => void;
     setTouched: (touched: import("formik").FormikTouched<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
     setValues: (values: React.SetStateAction<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
-    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void;
+    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
     setFieldError: (field: string, message: string) => void;
     setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
     validateForm: (values?: any) => Promise<import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
@@ -44,7 +44,7 @@ export declare function useForgotPasswordData(): {
         (e: React.ChangeEvent<any>): void;
         <T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
     };
-    getFieldProps: <Value = any>(props: any) => import("formik").FieldInputProps<Value>;
+    getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
     getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
     getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
     dirty: boolean;

package/components/Auth/ResetPasswordProvider.d.ts

@@ -38,7 +38,9 @@ export declare function useResetPasswordForm(): {
     setValues: (values: React.SetStateAction<{
         newPassword: string;
     }>, shouldValidate?: boolean) => void;
-    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void;
+    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<{
+        newPassword: string;
+    }>>;
     setFieldError: (field: string, message: string) => void;
     setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
     validateForm: (values?: any) => Promise<import("formik").FormikErrors<{
@@ -66,7 +68,7 @@ export declare function useResetPasswordForm(): {
         (e: React.ChangeEvent<any>): void;
         <T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
     };
-    getFieldProps: <Value = any>(props: any) => import("formik").FieldInputProps<Value>;
+    getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
     getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
     getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
     dirty: boolean;

package/components/DynamicRoute/GenericError.d.ts

@@ -13,6 +13,6 @@ declare class ErrorBoundary extends React.Component<BoundaryErrorProps, Boundary
     state: BoundaryErrorState;
     static defaultProps: Partial<BoundaryErrorProps>;
     componentDidCatch(error: Error, info: React.ErrorInfo): void;
-    render(): string | number | boolean | React.JSX.Element | React.ReactFragment;
+    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode>;
 }
 export default ErrorBoundary;

package/data/cache.js

@@ -21,31 +21,14 @@ const createCache = () => new InMemoryCache({
             }
         },
         Product: {
-            fields: {
-                stockStatus: {
-                    merge(existing, incoming, { mergeObjects }) {
-                        // custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects
-                        // we do this to fix hydration mismatch on signup page
-                        // where we query for more settings in the already queried settings (tracking)
-                        return mergeObjects(existing, incoming);
-                    }
-                }
-            }
+            // https://www.apollographql.com/docs/react/caching/cache-configuration#disabling-normalization
+            keyFields: false
         }
+        // Category: {
+        //   // https://www.apollographql.com/docs/react/caching/cache-configuration#disabling-normalization
+        //   keyFields: false
+        // }
     }
-    // fragmentMatcher: new IntrospectionFragmentMatcher({
-    //   introspectionQueryResultData: {
-    //     __schema: {
-    //       types: fragmentTypes
-    //     }
-    //   }
-    // }),
-    // cacheRedirects: {
-    //   Query: {
-    //     product: (_, args) => toIdValue(`Product:${args.id}`),
-    //     category: (_, args) => toIdValue(`Category:${args.id}`)
-    //   }
-    // }
 });
 export default createCache;
 //# sourceMappingURL=cache.js.map

package/data/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,IAAI,aAAa,CAAC;IAChB,aAAa,oBACR,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACxD;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CACP;IACD,YAAY,EAAE;QACZ,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,QAAQ,EAAE;oBACR,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE;wBACxC,iFAAiF;wBACjF,sDAAsD;wBACtD,8EAA8E;wBAC9E,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC1C,CAAC;iBACF;aACF;SACF;QACD,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,WAAW,EAAE;oBACX,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE;wBACxC,iFAAiF;wBACjF,sDAAsD;wBACtD,8EAA8E;wBAC9E,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC1C,CAAC;iBACF;aACF;SACF;KACF;IACD,sDAAsD;IACtD,oCAAoC;IACpC,kBAAkB;IAClB,6BAA6B;IAC7B,QAAQ;IACR,MAAM;IACN,MAAM;IACN,oBAAoB;IACpB,aAAa;IACb,6DAA6D;IAC7D,8DAA8D;IAC9D,MAAM;IACN,IAAI;CACL,CAAC,CAAC;AAEL,eAAe,WAAW,CAAC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,IAAI,aAAa,CAAC;IAChB,aAAa,oBACR,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACxD;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CACP;IACD,YAAY,EAAE;QACZ,OAAO,EAAE;YACP,MAAM,EAAE;gBACN,QAAQ,EAAE;oBACR,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE;wBACxC,iFAAiF;wBACjF,sDAAsD;wBACtD,8EAA8E;wBAC9E,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC1C,CAAC;iBACF;aACF;SACF;QACD,OAAO,EAAE;YACP,+FAA+F;YAC/F,SAAS,EAAE,KAAK;SACjB;QACD,cAAc;QACd,oGAAoG;QACpG,qBAAqB;QACrB,IAAI;KACL;CACF,CAAC,CAAC;AAEL,eAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/core",
-  "version": "5.17.0-alpha.63e16fd6",
+  "version": "5.17.0-alpha.72f771f3",
   "license": "MIT",
   "files": [
     "**/*.js",
@@ -42,7 +42,7 @@
     "@sentry/browser": "^6.15.0",
     "@sentry/core": "^6.15.0",
     "@sentry/node": "^6.15.0",
-    "@tanem/react-nprogress": "^1.1.0",
+    "@tanem/react-nprogress": "^5.0.44",
     "@types/accept-language-parser": "^1.5.1",
     "@types/gtag.js": "^0.0.10",
     "@types/loadable__component": "^5.10.0",
@@ -61,7 +61,7 @@
     "express-graphql": "^0.12.0",
     "fontfaceobserver": "^2.1.0",
     "format-message": "^6.2.4",
-    "graphql": "^14.5.8",
+    "graphql": "^15.3.0",
     "immer": "^10.0.2",
     "intl": "^1.2.5",
     "isbot": "^2.2.1",
@@ -78,10 +78,8 @@
     "react-router-dom": "^5.2.1",
     "request-ip": "^2.1.3",
     "schema-dts": "^0.8.2",
-    "store-css": "^0.3.0",
     "ts-node": "^7.0.1",
     "typed-emitter": "^0.1.0",
-    "typescript": "^4.8.3",
     "universal-cookie-express": "^4.0.3",
     "uuid": "^8.3.2",
     "web-vitals": "^0.2.3",
@@ -113,7 +111,8 @@
     "jest-dom": "^3.4.0",
     "lint-staged": "^8.1.5",
     "nock": "^10.0.6",
-    "prettier": "^2.3.2"
+    "prettier": "^2.3.2",
+    "typescript": "^4.8.3"
   },
   "peerDependencies": {
     "react": "^18",

package/components/Fonts/GoogleFont.d.ts

@@ -1,10 +0,0 @@
-import * as React from 'react';
-import { primaryFont, secondaryFonts } from './injectFont';
-export type GoogleFontProps = {
-    primaryFont?: primaryFont;
-    secondaryFonts?: secondaryFonts;
-};
-export default class GoogleFont extends React.PureComponent<GoogleFontProps, {}> {
-    componentDidMount: () => void;
-    render(): null;
-}

package/components/Fonts/GoogleFont.js

@@ -1,35 +0,0 @@
-import * as React from 'react';
-import { injectFont } from './injectFont';
-export default class GoogleFont extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        // Uses Google's CDN to request the desired font
-        this.componentDidMount = () => {
-            const { primaryFont = '', secondaryFonts = [] } = this.props;
-            handleGoogleFonts([primaryFont, ...secondaryFonts]);
-            injectFont(cleanFontName(primaryFont), secondaryFonts.map(font => cleanFontName(font)));
-        };
-    }
-    render() {
-        return null;
-    }
-}
-function cleanFontName(family) {
-    // Takes a font formatted as `Source+Sans+Pro:400,600&subset=greek-ext`
-    // and returns 'Source Sans Pro'
-    return family
-        .split('&')[0]
-        .split(':')[0]
-        .replace(/\+/gi, ' ');
-}
-function handleGoogleFonts(families) {
-    // import external font stylesheet and store it in session storage to optimise
-    // future loads
-    // Check for document first as this should not run on the server
-    document &&
-        import('store-css').then(module => families.map(family => module.default.css(`https://fonts.googleapis.com/css?family=${family}`, {
-            crossOrigin: 'anonymous',
-            storage: 'session'
-        })));
-}
-//# sourceMappingURL=GoogleFont.js.map

package/components/Fonts/GoogleFont.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GoogleFont.js","sourceRoot":"","sources":["GoogleFont.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAA+B,MAAM,cAAc,CAAC;AAOvE,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,KAAK,CAAC,aAG7C;IAHD;;QAIE,gDAAgD;QAChD,sBAAiB,GAAG,GAAG,EAAE;YACvB,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAE7D,iBAAiB,CAAC,CAAC,WAAW,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC;YAEpD,UAAU,CACR,aAAa,CAAC,WAAW,CAAC,EAC1B,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAChD,CAAC;QACJ,CAAC,CAAC;IAKJ,CAAC;IAHQ,MAAM;QACX,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,2EAA2E;IAC3E,gCAAgC;IAChC,OAAO,MAAM;SACV,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACb,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACb,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAkB;IAC3C,8EAA8E;IAC9E,eAAe;IACf,gEAAgE;IAChE,QAAQ;QACN,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAChC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAChB,2CAA2C,MAAM,EAAE,EACnD;YACE,WAAW,EAAE,WAAW;YACxB,OAAO,EAAE,SAAS;SACnB,CACF,CACF,CACF,CAAC;AACN,CAAC"}

package/components/Fonts/TypekitFont.d.ts

@@ -1,16 +0,0 @@
-import * as React from 'react';
-import { primaryFont, secondaryFonts } from './injectFont';
-type TypekitFontProps = {
-    primaryFont?: primaryFont;
-    secondaryFonts?: secondaryFonts;
-    /**
-     * The embed code ID given by Adobe.
-     * @see https://helpx.adobe.com/fonts/using/embed-codes.html
-     */
-    id: string;
-};
-export default class TypekitFont extends React.PureComponent<TypekitFontProps, {}> {
-    componentDidMount: () => void;
-    render(): null;
-}
-export {};

package/components/Fonts/TypekitFont.js

@@ -1,25 +0,0 @@
-import * as React from 'react';
-import { injectFont } from './injectFont';
-function handleTypekitFonts(id) {
-    // Check for document first as this should not run on the server
-    document &&
-        import('store-css').then(module => module.default.css(`https://use.typekit.net/${id}.css`, {
-            crossOrigin: 'anonymous',
-            storage: 'session'
-        }));
-}
-export default class TypekitFont extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        // Uses Google's CDN to request the desired font
-        this.componentDidMount = () => {
-            const { primaryFont = '', secondaryFonts = [], id } = this.props;
-            injectFont(primaryFont, secondaryFonts);
-            handleTypekitFonts(id);
-        };
-    }
-    render() {
-        return null;
-    }
-}
-//# sourceMappingURL=TypekitFont.js.map

package/components/Fonts/TypekitFont.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TypekitFont.js","sourceRoot":"","sources":["TypekitFont.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAA+B,MAAM,cAAc,CAAC;AAYvE,SAAS,kBAAkB,CAAC,EAAU;IACpC,gEAAgE;IAChE,QAAQ;QACN,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAChC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,EAAE;YACtD,WAAW,EAAE,WAAW;YACxB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC;AACN,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,KAAK,CAAC,aAG9C;IAHD;;QAIE,gDAAgD;QAChD,sBAAiB,GAAG,GAAG,EAAE;YACvB,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjE,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACxC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC,CAAC;IAKJ,CAAC;IAHQ,MAAM;QACX,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}