@vendure/core 1.4.1 → 1.4.5

package/dist/api/config/graphql-custom-fields.js

@@ -13,13 +13,13 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
     const schema = typeof typeDefsOrSchema === 'string' ? graphql_1.buildSchema(typeDefsOrSchema) : typeDefsOrSchema;
     let customFieldTypeDefs = '';
     if (!schema.getType('JSON')) {
-        customFieldTypeDefs += `
-            scalar JSON
+        customFieldTypeDefs += `
+            scalar JSON
         `;
     }
     if (!schema.getType('DateTime')) {
-        customFieldTypeDefs += `
-            scalar DateTime
+        customFieldTypeDefs += `
+            scalar DateTime
         `;
     }
     for (const entityName of Object.keys(customFieldConfig)) {
@@ -40,87 +40,87 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         const filterableFields = customEntityFields.filter(field => field.type !== 'relation');
         if (schema.getType(entityName)) {
             if (customEntityFields.length) {
-                customFieldTypeDefs += `
-                    type ${entityName}CustomFields {
-                        ${mapToFields(customEntityFields, getGraphQlType)}
-                    }
-
-                    extend type ${entityName} {
-                        customFields: ${entityName}CustomFields
-                    }
+                customFieldTypeDefs += `
+                    type ${entityName}CustomFields {
+                        ${mapToFields(customEntityFields, getGraphQlType)}
+                    }
+
+                    extend type ${entityName} {
+                        customFields: ${entityName}CustomFields
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                    extend type ${entityName} {
-                        customFields: JSON
-                    }
+                customFieldTypeDefs += `
+                    extend type ${entityName} {
+                        customFields: JSON
+                    }
                 `;
             }
         }
         if (localeStringFields.length && schema.getType(`${entityName}Translation`)) {
-            customFieldTypeDefs += `
-                    type ${entityName}TranslationCustomFields {
-                         ${mapToFields(localeStringFields, getGraphQlType)}
-                    }
-
-                    extend type ${entityName}Translation {
-                        customFields: ${entityName}TranslationCustomFields
-                    }
+            customFieldTypeDefs += `
+                    type ${entityName}TranslationCustomFields {
+                         ${mapToFields(localeStringFields, getGraphQlType)}
+                    }
+
+                    extend type ${entityName}Translation {
+                        customFields: ${entityName}TranslationCustomFields
+                    }
                 `;
         }
         if (schema.getType(`Create${entityName}Input`)) {
             if (writeableNonLocaleStringFields.length) {
-                customFieldTypeDefs += `
-                    input Create${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
-                    }
-
-                    extend input Create${entityName}Input {
-                        customFields: Create${entityName}CustomFieldsInput
-                    }
+                customFieldTypeDefs += `
+                    input Create${entityName}CustomFieldsInput {
+                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+                    }
+
+                    extend input Create${entityName}Input {
+                        customFields: Create${entityName}CustomFieldsInput
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                   extend input Create${entityName}Input {
-                       customFields: JSON
-                   }
+                customFieldTypeDefs += `
+                   extend input Create${entityName}Input {
+                       customFields: JSON
+                   }
                `;
             }
         }
         if (schema.getType(`Update${entityName}Input`)) {
             if (writeableNonLocaleStringFields.length) {
-                customFieldTypeDefs += `
-                    input Update${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
-                    }
-
-                    extend input Update${entityName}Input {
-                        customFields: Update${entityName}CustomFieldsInput
-                    }
+                customFieldTypeDefs += `
+                    input Update${entityName}CustomFieldsInput {
+                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+                    }
+
+                    extend input Update${entityName}Input {
+                        customFields: Update${entityName}CustomFieldsInput
+                    }
                 `;
             }
             else {
-                customFieldTypeDefs += `
-                    extend input Update${entityName}Input {
-                        customFields: JSON
-                    }
+                customFieldTypeDefs += `
+                    extend input Update${entityName}Input {
+                        customFields: JSON
+                    }
                 `;
             }
         }
         if (customEntityFields.length && schema.getType(`${entityName}SortParameter`)) {
-            customFieldTypeDefs += `
-                    extend input ${entityName}SortParameter {
-                         ${mapToFields(customEntityFields, () => 'SortOrder')}
-                    }
+            customFieldTypeDefs += `
+                    extend input ${entityName}SortParameter {
+                         ${mapToFields(customEntityFields, () => 'SortOrder')}
+                    }
                 `;
         }
         if (filterableFields.length && schema.getType(`${entityName}FilterParameter`)) {
-            customFieldTypeDefs += `
-                    extend input ${entityName}FilterParameter {
-                         ${mapToFields(filterableFields, getFilterOperator)}
-                    }
+            customFieldTypeDefs += `
+                    extend input ${entityName}FilterParameter {
+                         ${mapToFields(filterableFields, getFilterOperator)}
+                    }
                 `;
         }
         if (writeableLocaleStringFields) {
@@ -132,21 +132,21 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
             for (const inputName of translationInputs) {
                 if (schema.getType(inputName)) {
                     if (writeableLocaleStringFields.length) {
-                        customFieldTypeDefs += `
-                            input ${inputName}CustomFields {
-                                ${mapToFields(writeableLocaleStringFields, getGraphQlType)}
-                            }
-
-                            extend input ${inputName} {
-                                customFields: ${inputName}CustomFields
-                            }
+                        customFieldTypeDefs += `
+                            input ${inputName}CustomFields {
+                                ${mapToFields(writeableLocaleStringFields, getGraphQlType)}
+                            }
+
+                            extend input ${inputName} {
+                                customFields: ${inputName}CustomFields
+                            }
                         `;
                     }
                     else {
-                        customFieldTypeDefs += `
-                            extend input ${inputName} {
-                                customFields: JSON
-                            }
+                        customFieldTypeDefs += `
+                            extend input ${inputName} {
+                                customFields: JSON
+                            }
                         `;
                     }
                 }
@@ -157,26 +157,26 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         // For custom fields on the Address entity, we also extend the OrderAddress
         // type (which is used to store address snapshots on Orders)
         if (schema.getType('OrderAddress')) {
-            customFieldTypeDefs += `
-                extend type OrderAddress {
-                    customFields: AddressCustomFields
-                }
+            customFieldTypeDefs += `
+                extend type OrderAddress {
+                    customFields: AddressCustomFields
+                }
             `;
         }
         if (schema.getType('UpdateOrderAddressInput')) {
-            customFieldTypeDefs += `
-                extend input UpdateOrderAddressInput {
-                    customFields: UpdateAddressCustomFieldsInput
-                }
+            customFieldTypeDefs += `
+                extend input UpdateOrderAddressInput {
+                    customFields: UpdateAddressCustomFieldsInput
+                }
             `;
         }
     }
     else {
         if (schema.getType('OrderAddress')) {
-            customFieldTypeDefs += `
-                extend type OrderAddress {
-                    customFields: JSON
-                }
+            customFieldTypeDefs += `
+                extend type OrderAddress {
+                    customFields: JSON
+                }
         `;
         }
     }
@@ -185,24 +185,24 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
 exports.addGraphQLCustomFields = addGraphQLCustomFields;
 function addServerConfigCustomFields(typeDefsOrSchema, customFieldConfig) {
     const schema = typeof typeDefsOrSchema === 'string' ? graphql_1.buildSchema(typeDefsOrSchema) : typeDefsOrSchema;
-    const customFieldTypeDefs = `
-            type CustomFields {
-                ${Object.keys(customFieldConfig).reduce((output, name) => output + name + `: [CustomFieldConfig!]!\n`, '')}
-            }
-
-            extend type ServerConfig {
-                customFieldConfig: CustomFields!
-            }
+    const customFieldTypeDefs = `
+            type CustomFields {
+                ${Object.keys(customFieldConfig).reduce((output, name) => output + name + `: [CustomFieldConfig!]!\n`, '')}
+            }
+
+            extend type ServerConfig {
+                customFieldConfig: CustomFields!
+            }
         `;
     return graphql_1.extendSchema(schema, graphql_1.parse(customFieldTypeDefs));
 }
 exports.addServerConfigCustomFields = addServerConfigCustomFields;
 function addActiveAdministratorCustomFields(typeDefsOrSchema, administratorCustomFields) {
     const schema = typeof typeDefsOrSchema === 'string' ? graphql_1.buildSchema(typeDefsOrSchema) : typeDefsOrSchema;
-    const extension = `
-        extend input UpdateActiveAdministratorInput {
-            customFields: ${0 < (administratorCustomFields === null || administratorCustomFields === void 0 ? void 0 : administratorCustomFields.length) ? 'UpdateAdministratorCustomFieldsInput' : 'JSON'}
-        }
+    const extension = `
+        extend input UpdateActiveAdministratorInput {
+            customFields: ${0 < (administratorCustomFields === null || administratorCustomFields === void 0 ? void 0 : administratorCustomFields.length) ? 'UpdateAdministratorCustomFieldsInput' : 'JSON'}
+        }
     `;
     return graphql_1.extendSchema(schema, graphql_1.parse(extension));
 }
@@ -223,14 +223,14 @@ function addRegisterCustomerCustomFieldsInput(typeDefsOrSchema, customerCustomFi
     if (publicWritableCustomFields.length < 1) {
         return schema;
     }
-    const customFieldTypeDefs = `
-        input RegisterCustomerCustomFieldsInput {
-            ${mapToFields(publicWritableCustomFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
-        }
-
-        extend input RegisterCustomerInput {
-            customFields: RegisterCustomerCustomFieldsInput
-        }
+    const customFieldTypeDefs = `
+        input RegisterCustomerCustomFieldsInput {
+            ${mapToFields(publicWritableCustomFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+        }
+
+        extend input RegisterCustomerInput {
+            customFields: RegisterCustomerCustomFieldsInput
+        }
     `;
     return graphql_1.extendSchema(schema, graphql_1.parse(customFieldTypeDefs));
 }
@@ -245,10 +245,10 @@ function addModifyOrderCustomFields(typeDefsOrSchema, orderCustomFields) {
         return schema;
     }
     if (schema.getType('ModifyOrderInput') && schema.getType('UpdateOrderCustomFieldsInput')) {
-        const customFieldTypeDefs = `
-                extend input ModifyOrderInput {
-                    customFields: UpdateOrderCustomFieldsInput
-                }
+        const customFieldTypeDefs = `
+                extend input ModifyOrderInput {
+                    customFields: UpdateOrderCustomFieldsInput
+                }
             `;
         return graphql_1.extendSchema(schema, graphql_1.parse(customFieldTypeDefs));
     }
@@ -308,18 +308,18 @@ function addOrderLineCustomFieldsInput(typeDefsOrSchema, orderLineCustomFields)
     }
     let extendedSchema = new graphql_1.GraphQLSchema(schemaConfig);
     if (schema.getType('AddItemInput')) {
-        const customFieldTypeDefs = `
-            extend input AddItemInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input AddItemInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = graphql_1.extendSchema(extendedSchema, graphql_1.parse(customFieldTypeDefs));
     }
     if (schema.getType('AdjustOrderLineInput')) {
-        const customFieldTypeDefs = `
-            extend input AdjustOrderLineInput {
-                customFields: OrderLineCustomFieldsInput
-            }
+        const customFieldTypeDefs = `
+            extend input AdjustOrderLineInput {
+                customFields: OrderLineCustomFieldsInput
+            }
         `;
         extendedSchema = graphql_1.extendSchema(extendedSchema, graphql_1.parse(customFieldTypeDefs));
     }
@@ -331,17 +331,17 @@ function addShippingMethodQuoteCustomFields(typeDefsOrSchema, shippingMethodCust
     let customFieldTypeDefs = ``;
     const publicCustomFields = shippingMethodCustomFields.filter(f => f.public !== false);
     if (0 < publicCustomFields.length) {
-        customFieldTypeDefs = `
-            extend type ShippingMethodQuote {
-                customFields: ShippingMethodCustomFields
-            }
+        customFieldTypeDefs = `
+            extend type ShippingMethodQuote {
+                customFields: ShippingMethodCustomFields
+            }
         `;
     }
     else {
-        customFieldTypeDefs = `
-            extend type ShippingMethodQuote {
-                customFields: JSON
-            }
+        customFieldTypeDefs = `
+            extend type ShippingMethodQuote {
+                customFields: JSON
+            }
         `;
     }
     return graphql_1.extendSchema(schema, graphql_1.parse(customFieldTypeDefs));
@@ -352,17 +352,17 @@ function addPaymentMethodQuoteCustomFields(typeDefsOrSchema, paymentMethodCustom
     let customFieldTypeDefs = ``;
     const publicCustomFields = paymentMethodCustomFields.filter(f => f.public !== false);
     if (0 < publicCustomFields.length) {
-        customFieldTypeDefs = `
-            extend type PaymentMethodQuote {
-                customFields: PaymentMethodCustomFields
-            }
+        customFieldTypeDefs = `
+            extend type PaymentMethodQuote {
+                customFields: PaymentMethodCustomFields
+            }
         `;
     }
     else {
-        customFieldTypeDefs = `
-            extend type PaymentMethodQuote {
-                customFields: JSON
-            }
+        customFieldTypeDefs = `
+            extend type PaymentMethodQuote {
+                customFields: JSON
+            }
         `;
     }
     return graphql_1.extendSchema(schema, graphql_1.parse(customFieldTypeDefs));

package/dist/api/middleware/exception-logger.filter.d.ts

@@ -4,7 +4,7 @@ import { I18nError } from '../../i18n/i18n-error';
  * Logs thrown I18nErrors via the configured VendureLogger.
  */
 export declare class ExceptionLoggerFilter implements ExceptionFilter {
-    catch(exception: Error | HttpException | I18nError, host: ArgumentsHost): void;
+    catch(exception: Error | HttpException | I18nError, host: ArgumentsHost): I18nError | undefined;
     /**
      * For a given I18nError.code, returns a corresponding HTTP
      * status code.

package/dist/api/middleware/exception-logger.filter.js

@@ -35,17 +35,23 @@ class ExceptionLoggerFilter {
                     config_1.Logger.verbose(message);
                     break;
             }
+            if (exception.stack) {
+                config_1.Logger.debug(exception.stack);
+            }
+            if (isGraphQL) {
+                return exception;
+            }
         }
         else if (exception instanceof common_1.HttpException) {
             // Handle other Nestjs errors
             statusCode = exception.getStatus();
             message = exception.message;
-            let stack = exception.stack;
             if (statusCode === 404) {
-                message = exception.message;
-                stack = undefined;
+                config_1.Logger.verbose(exception.message);
+            }
+            else {
+                config_1.Logger.error(message, undefined, exception.stack);
             }
-            config_1.Logger.error(message, undefined, stack);
         }
         else {
             config_1.Logger.error(exception.message, undefined, exception.stack);

package/dist/api/middleware/exception-logger.filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"exception-logger.filter.js","sourceRoot":"","sources":["../../../src/api/middleware/exception-logger.filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exception-logger.filter.js","sourceRoot":"","sources":["../../../src/api/middleware/exception-logger.filter.ts"],"names":[],"mappings":"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"}

package/dist/api/resolvers/shop/shop-auth.resolver.js

@@ -135,6 +135,9 @@ let ShopAuthResolver = class ShopAuthResolver extends base_auth_resolver_1.BaseA
                 },
             },
         }, req, res);
+        if (error_result_1.isGraphQlErrorResult(authResult) && authResult.__typename === 'NotVerifiedError') {
+            return authResult;
+        }
         if (error_result_1.isGraphQlErrorResult(authResult)) {
             // This should never occur in theory
             throw authResult;

package/dist/api/resolvers/shop/shop-auth.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"shop-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-auth.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shop-auth.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/shop/shop-auth.resolver.ts"],"names":[],"mappings":"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"}

package/dist/api/schema/shop-api/shop.api.graphql

@@ -239,6 +239,7 @@ union ResetPasswordResult =
     | PasswordResetTokenInvalidError
     | PasswordResetTokenExpiredError
     | NativeAuthStrategyError
+    | NotVerifiedError
 union NativeAuthenticationResult =
       CurrentUser
     | InvalidCredentialsError

package/dist/common/types/entity-relation-paths.d.ts

@@ -19,9 +19,9 @@ import { VendureEntity } from '../../entity/base/base.entity';
  *
  * @docsCategory Common
  */
-export declare type EntityRelationPaths<T extends VendureEntity> = PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
+export declare type EntityRelationPaths<T extends VendureEntity> = `customFields.${string}` | PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
 export declare type EntityRelationKeys<T extends VendureEntity> = {
-    [K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity ? K : Required<T>[K] extends VendureEntity[] ? K : never;
+    [K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity | null ? K : Required<T>[K] extends VendureEntity[] ? K : never;
 }[Extract<keyof T, string>];
 export declare type EntityRelations<T extends VendureEntity> = {
     [K in EntityRelationKeys<T>]: T[K];

package/dist/config/entity-id-strategy/uuid-id-strategy.d.ts

@@ -3,15 +3,18 @@ import { EntityIdStrategy } from './entity-id-strategy';
  * @description
  * An id strategy which uses string uuids as primary keys
  * for all entities. This strategy can be configured with the
- * `entityIdStrategy` property of the {@link VendureConfig}.
+ * `entityIdStrategy` property of the `entityOptions` property
+ * of {@link VendureConfig}.
  *
  * @example
  * ```TypeScript
  * import { UuidIdStrategy, VendureConfig } from '\@vendure/core';
  *
  * export const config: VendureConfig = {
- *   entityIdStrategy: new UuidIdStrategy(),
- *   // ...
+ *   entityOptions: {
+ *     entityIdStrategy: new UuidIdStrategy(),
+ *     // ...
+ *   }
  * }
  * ```
  *

package/dist/config/entity-id-strategy/uuid-id-strategy.js

@@ -5,15 +5,18 @@ exports.UuidIdStrategy = void 0;
  * @description
  * An id strategy which uses string uuids as primary keys
  * for all entities. This strategy can be configured with the
- * `entityIdStrategy` property of the {@link VendureConfig}.
+ * `entityIdStrategy` property of the `entityOptions` property
+ * of {@link VendureConfig}.
  *
  * @example
  * ```TypeScript
  * import { UuidIdStrategy, VendureConfig } from '\@vendure/core';
  *
  * export const config: VendureConfig = {
- *   entityIdStrategy: new UuidIdStrategy(),
- *   // ...
+ *   entityOptions: {
+ *     entityIdStrategy: new UuidIdStrategy(),
+ *     // ...
+ *   }
  * }
  * ```
  *

package/dist/config/entity-id-strategy/uuid-id-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"uuid-id-strategy.js","sourceRoot":"","sources":["../../../src/config/entity-id-strategy/uuid-id-strategy.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAa,cAAc;IAA3B;QACa,mBAAc,GAAG,MAAM,CAAC;IAOrC,CAAC;IANG,QAAQ,CAAC,EAAU;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IACD,QAAQ,CAAC,UAAkB;QACvB,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AARD,wCAQC"}
+{"version":3,"file":"uuid-id-strategy.js","sourceRoot":"","sources":["../../../src/config/entity-id-strategy/uuid-id-strategy.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,cAAc;IAA3B;QACa,mBAAc,GAAG,MAAM,CAAC;IAOrC,CAAC;IANG,QAAQ,CAAC,EAAU;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IACD,QAAQ,CAAC,UAAkB;QACvB,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AARD,wCAQC"}

package/dist/config/logger/vendure-logger.d.ts

@@ -8,12 +8,31 @@ import { LoggerService } from '@nestjs/common';
 export declare enum LogLevel {
     /**
      * @description
-     * Log Errors only.
+     * Log Errors only. These are usually indicative of some potentially
+     * serious issue, so should be acted upon.
      */
     Error = 0,
+    /**
+     * @description
+     * Warnings indicate that some situation may require investigation
+     * and handling. But not as serious as an Error.
+     */
     Warn = 1,
+    /**
+     * @description
+     * Logs general information such as startup messages.
+     */
     Info = 2,
+    /**
+     * @description
+     * Logs additional information
+     */
     Verbose = 3,
+    /**
+     * @description
+     * Logs detailed info useful in debug scenarios, including stack traces for
+     * all errors. In production this would probably generate too much noise.
+     */
     Debug = 4
 }
 /**

package/dist/config/logger/vendure-logger.js

@@ -11,20 +11,49 @@ var LogLevel;
 (function (LogLevel) {
     /**
      * @description
-     * Log Errors only.
+     * Log Errors only. These are usually indicative of some potentially
+     * serious issue, so should be acted upon.
      */
     LogLevel[LogLevel["Error"] = 0] = "Error";
+    /**
+     * @description
+     * Warnings indicate that some situation may require investigation
+     * and handling. But not as serious as an Error.
+     */
     LogLevel[LogLevel["Warn"] = 1] = "Warn";
+    /**
+     * @description
+     * Logs general information such as startup messages.
+     */
     LogLevel[LogLevel["Info"] = 2] = "Info";
+    /**
+     * @description
+     * Logs additional information
+     */
     LogLevel[LogLevel["Verbose"] = 3] = "Verbose";
+    /**
+     * @description
+     * Logs detailed info useful in debug scenarios, including stack traces for
+     * all errors. In production this would probably generate too much noise.
+     */
     LogLevel[LogLevel["Debug"] = 4] = "Debug";
 })(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
 const noopLogger = {
-    error() { },
-    warn() { },
-    info() { },
-    verbose() { },
-    debug() { },
+    error() {
+        /* */
+    },
+    warn() {
+        /* */
+    },
+    info() {
+        /* */
+    },
+    verbose() {
+        /* */
+    },
+    debug() {
+        /* */
+    },
 };
 /**
  * @description