@vendure/core 1.4.0-beta.0 → 1.4.3

package/dist/api/schema/common/common-types.graphql

@@ -73,6 +73,7 @@ input ConfigurableOperationInput {
     arguments: [ConfigArgInput!]!
 }
 
+"Operators for filtering on a String field"
 input StringOperators {
     eq: String
     notEq: String
@@ -83,6 +84,15 @@ input StringOperators {
     regex: String
 }
 
+"Operators for filtering on an ID field"
+input IDOperators {
+    eq: String
+    notEq: String
+    in: [String!]
+    notIn: [String!]
+}
+
+"Operators for filtering on a Boolean field"
 input BooleanOperators {
     eq: Boolean
 }
@@ -92,6 +102,7 @@ input NumberRange {
     end: Float!
 }
 
+"Operators for filtering on a Int or Float field"
 input NumberOperators {
     eq: Float
     lt: Float
@@ -106,6 +117,7 @@ input DateRange {
     end: DateTime!
 }
 
+"Operators for filtering on a DateTime field"
 input DateOperators {
     eq: DateTime
     before: DateTime

package/dist/api/schema/{admin-api → common}/payment-method.type.graphql

@@ -9,3 +9,4 @@ type PaymentMethod implements Node {
     checker: ConfigurableOperation
     handler: ConfigurableOperation!
 }
+

package/dist/common/configurable-operation.d.ts

@@ -28,7 +28,7 @@ export interface ConfigArgCommonDef<T extends ConfigArgType> {
     list?: boolean;
     label?: LocalizedStringArray;
     description?: LocalizedStringArray;
-    ui?: UiComponentConfig;
+    ui?: UiComponentConfig<string>;
 }
 export declare type ConfigArgListDef<T extends ConfigArgType, C extends ConfigArgCommonDef<T> = ConfigArgCommonDef<T>> = C & {
     list: true;

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>]: T[K] extends VendureEntity ? K : T[K] extends VendureEntity[] ? K : never;
+    [K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity ? 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/auth/bcrypt-password-hashing-strategy.d.ts

@@ -8,7 +8,7 @@ import { PasswordHashingStrategy } from './password-hashing-strategy';
  */
 export declare class BcryptPasswordHashingStrategy implements PasswordHashingStrategy {
     private bcrypt;
-    constructor();
     hash(plaintext: string): Promise<string>;
     check(plaintext: string, hash: string): Promise<boolean>;
+    private getBcrypt;
 }

package/dist/config/auth/bcrypt-password-hashing-strategy.js

@@ -10,19 +10,23 @@ const SALT_ROUNDS = 12;
  * @since 1.3.0
  */
 class BcryptPasswordHashingStrategy {
-    constructor() {
-        // The bcrypt lib is lazily loaded so that if we want to run Vendure
-        // in an environment that does not support native Node modules
-        // (such as an online sandbox like Stackblitz) the bcrypt dependency
-        // does not get loaded when linking the source files on startup.
-        this.bcrypt = require('bcrypt');
-    }
     hash(plaintext) {
+        this.getBcrypt();
         return this.bcrypt.hash(plaintext, SALT_ROUNDS);
     }
     check(plaintext, hash) {
+        this.getBcrypt();
         return this.bcrypt.compare(plaintext, hash);
     }
+    getBcrypt() {
+        if (!this.bcrypt) {
+            // The bcrypt lib is lazily loaded so that if we want to run Vendure
+            // in an environment that does not support native Node modules
+            // (such as an online sandbox like Stackblitz) the bcrypt dependency
+            // does not get loaded when linking the source files on startup.
+            this.bcrypt = require('bcrypt');
+        }
+    }
 }
 exports.BcryptPasswordHashingStrategy = BcryptPasswordHashingStrategy;
 //# sourceMappingURL=bcrypt-password-hashing-strategy.js.map

package/dist/config/auth/bcrypt-password-hashing-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"bcrypt-password-hashing-strategy.js","sourceRoot":"","sources":["../../../src/config/auth/bcrypt-password-hashing-strategy.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;;;GAMG;AACH,MAAa,6BAA6B;IAGtC;QACI,oEAAoE;QACpE,8DAA8D;QAC9D,oEAAoE;QACpE,gEAAgE;QAChE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,SAAiB;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;CACJ;AAlBD,sEAkBC"}
+{"version":3,"file":"bcrypt-password-hashing-strategy.js","sourceRoot":"","sources":["../../../src/config/auth/bcrypt-password-hashing-strategy.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;;;GAMG;AACH,MAAa,6BAA6B;IAGtC,IAAI,CAAC,SAAiB;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAEO,SAAS;QACb,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,oEAAoE;YACpE,8DAA8D;YAC9D,oEAAoE;YACpE,gEAAgE;YAChE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;CACJ;AAtBD,sEAsBC"}

package/dist/config/catalog/collection-filter.d.ts

@@ -13,7 +13,7 @@ export interface CollectionFilterConfig<T extends ConfigArgs> extends Configurab
  * [`QueryBuilder`](https://typeorm.io/#/select-query-builder) object to which clauses may be added.
  *
  * Creating a CollectionFilter is considered an advanced Vendure topic. For more insight into how
- * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/collection/default-collection-filters.ts)
+ * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/catalog/default-collection-filters.ts)
  *
  * @docsCategory configuration
  */

package/dist/config/catalog/collection-filter.js

@@ -10,7 +10,7 @@ const configurable_operation_1 = require("../../common/configurable-operation");
  * [`QueryBuilder`](https://typeorm.io/#/select-query-builder) object to which clauses may be added.
  *
  * Creating a CollectionFilter is considered an advanced Vendure topic. For more insight into how
- * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/collection/default-collection-filters.ts)
+ * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/catalog/default-collection-filters.ts)
  *
  * @docsCategory configuration
  */

package/dist/config/catalog/default-collection-filters.d.ts

@@ -7,7 +7,7 @@ export declare const facetValueCollectionFilter: CollectionFilter<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
     containsAny: {
@@ -18,7 +18,7 @@ export declare const variantNameCollectionFilter: CollectionFilter<{
     operator: {
         type: "string";
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 value: string;
             }[];
@@ -33,7 +33,7 @@ export declare const defaultCollectionFilters: (CollectionFilter<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
     containsAny: {
@@ -43,7 +43,7 @@ export declare const defaultCollectionFilters: (CollectionFilter<{
     operator: {
         type: "string";
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 value: string;
             }[];

package/dist/config/custom-field/custom-field-types.d.ts

@@ -1,5 +1,5 @@
 import { BooleanCustomFieldConfig as GraphQLBooleanCustomFieldConfig, CustomField, DateTimeCustomFieldConfig as GraphQLDateTimeCustomFieldConfig, FloatCustomFieldConfig as GraphQLFloatCustomFieldConfig, IntCustomFieldConfig as GraphQLIntCustomFieldConfig, LocaleStringCustomFieldConfig as GraphQLLocaleStringCustomFieldConfig, LocalizedString, RelationCustomFieldConfig as GraphQLRelationCustomFieldConfig, StringCustomFieldConfig as GraphQLStringCustomFieldConfig, TextCustomFieldConfig as GraphQLTextCustomFieldConfig } from '@vendure/common/lib/generated-types';
-import { CustomFieldsObject, CustomFieldType, Type, UiComponentConfig } from '@vendure/common/lib/shared-types';
+import { CustomFieldsObject, CustomFieldType, DefaultFormComponentId, Type, UiComponentConfig } from '@vendure/common/lib/shared-types';
 import { Injector } from '../../common/injector';
 import { VendureEntity } from '../../entity/base/base.entity';
 export declare type DefaultValueType<T extends CustomFieldType> = T extends 'string' | 'localeString' ? string : T extends 'int' | 'float' ? number : T extends 'boolean' ? boolean : T extends 'datetime' ? Date : T extends 'relation' ? any : never;
@@ -12,7 +12,7 @@ export declare type BaseTypedCustomFieldConfig<T extends CustomFieldType, C exte
      */
     public?: boolean;
     nullable?: boolean;
-    ui?: UiComponentConfig;
+    ui?: UiComponentConfig<DefaultFormComponentId | string>;
 };
 /**
  * @description
@@ -59,14 +59,14 @@ export declare type CustomFieldConfig = StringCustomFieldConfig | LocaleStringCu
  *
  * All custom fields share some common properties:
  *
- * * `name: string`: The name of the field
- * * `type: string`: A string of type {@link CustomFieldType}
- * * `list: boolean`: If set to `true`, then the field will be an array of the specified type
+ * * `name: string`: The name of the field.
+ * * `type: string`: A string of type {@link CustomFieldType}.
+ * * `list: boolean`: If set to `true`, then the field will be an array of the specified type.
  * * `label?: LocalizedString[]`: An array of localized labels for the field.
  * * `description?: LocalizedString[]`: An array of localized descriptions for the field.
- * * `public?: boolean`: Whether or not the custom field is available via the Shop API. Defaults to `true`
- * * `readonly?: boolean`: Whether or not the custom field can be updated via the GraphQL APIs. Defaults to `false`
- * * `internal?: boolean`: Whether or not the custom field is exposed at all via the GraphQL APIs. Defaults to `false`
+ * * `public?: boolean`: Whether or not the custom field is available via the Shop API. Defaults to `true`.
+ * * `readonly?: boolean`: Whether or not the custom field can be updated via the GraphQL APIs. Defaults to `false`.
+ * * `internal?: boolean`: Whether or not the custom field is exposed at all via the GraphQL APIs. Defaults to `false`.
  * * `defaultValue?: any`: The default value when an Entity is created with this field.
  * * `nullable?: boolean`: Whether the field is nullable in the database. If set to `false`, then a `defaultValue` should be provided.
  * * `validate?: (value: any) => string | LocalizedString[] | void`: A custom validation function. If the value is valid, then

package/dist/config/promotion/actions/buy-x-get-y-free-action.d.ts

@@ -10,7 +10,7 @@ export declare const buyXGetYFreeAction: PromotionItemAction<{}, import("..").Pr
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;
@@ -25,7 +25,7 @@ export declare const buyXGetYFreeAction: PromotionItemAction<{}, import("..").Pr
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/actions/facet-values-percentage-discount-action.d.ts

@@ -3,7 +3,7 @@ export declare const discountOnItemWithFacets: PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -11,7 +11,7 @@ export declare const discountOnItemWithFacets: PromotionItemAction<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, []>;

package/dist/config/promotion/actions/order-fixed-discount-action.d.ts

@@ -3,7 +3,7 @@ export declare const orderFixedDiscount: PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
 }, []>;

package/dist/config/promotion/actions/order-percentage-discount-action.d.ts

@@ -3,7 +3,7 @@ export declare const orderPercentageDiscount: PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };

package/dist/config/promotion/actions/product-percentage-discount-action.d.ts

@@ -4,7 +4,7 @@ export declare const productsPercentageDiscount: PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -12,7 +12,7 @@ export declare const productsPercentageDiscount: PromotionItemAction<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/buy-x-get-y-free-condition.d.ts

@@ -10,7 +10,7 @@ export declare const buyXGetYFreeCondition: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;
@@ -25,7 +25,7 @@ export declare const buyXGetYFreeCondition: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/contains-products-condition.d.ts

@@ -9,7 +9,7 @@ export declare const containsProducts: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/customer-group-condition.d.ts

@@ -4,7 +4,7 @@ export declare const customerGroup: PromotionCondition<{
     customerGroupId: {
         type: "ID";
         ui: {
-            component: "customer-group-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/has-facet-values-condition.d.ts

@@ -8,7 +8,7 @@ export declare const hasFacetValues: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, "at_least_n_with_facets", boolean>;

package/dist/config/promotion/conditions/min-order-amount-condition.d.ts

@@ -4,7 +4,7 @@ export declare const minimumOrderAmount: PromotionCondition<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
     taxInclusive: {

package/dist/config/promotion/index.d.ts

@@ -17,7 +17,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -32,7 +32,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -45,7 +45,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -53,29 +53,21 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "currency-form-input";
-        };
-    };
-}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "int";
-        ui: {
-            component: "number-form-input";
-            suffix: string;
+            component: string;
         };
     };
 }, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -83,7 +75,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -100,7 +92,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -115,7 +107,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -133,7 +125,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -144,7 +136,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
     customerGroupId: {
         type: "ID";
         ui: {
-            component: "customer-group-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -160,7 +152,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
@@ -168,7 +160,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
     taxInclusive: {

package/dist/config/shipping-method/default-shipping-calculator.d.ts

@@ -10,7 +10,7 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;
@@ -21,10 +21,10 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "string";
         defaultValue: TaxSetting;
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 label: {
-                    languageCode: LanguageCode.en;
+                    languageCode: LanguageCode;
                     value: string;
                 }[];
                 value: TaxSetting;
@@ -39,7 +39,7 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
         label: {

package/dist/config/shipping-method/default-shipping-eligibility-checker.d.ts

@@ -5,7 +5,7 @@ export declare const defaultShippingEligibilityChecker: ShippingEligibilityCheck
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/i18n/messages/en.json

@@ -1,6 +1,7 @@
 {
   "error": {
     "cannot-delete-role": "The role '{ roleCode }' cannot be deleted",
+    "cannot-delete-sole-superadmin": "The sole SuperAdmin cannot be deleted",
     "cannot-locate-customer-for-user": "Cannot locate a Customer for the user",
     "cannot-modify-role": "The role '{ roleCode }' cannot be modified",
     "cannot-create-sales-for-active-order": "Cannot create a Sale for an Order which is still active",
@@ -43,6 +44,7 @@
     "product-variant-options-combination-already-exists": "A ProductVariant with the selected options already exists: {variantName}",
     "promotion-channels-can-only-be-changed-from-default-channel": "Promotions channels may only be changed from the Default Channel",
     "stockonhand-cannot-be-negative": "stockOnHand cannot be a negative value",
+    "superadmin-must-have-superadmin-role": "Cannot remove the SuperAdmin role from the sole SuperAdmin",
     "unauthorized": "The credentials did not match. Please check and try again"
   },
   "errorResult": {

package/dist/job-queue/subscribable-job.js

@@ -48,7 +48,7 @@ class SubscribableJob extends job_1.Job {
             // tslint:disable-next-line:no-non-null-assertion
             return rxjs_1.interval(pollInterval).pipe(operators_1.tap(i => {
                 if (timeoutMs < i * pollInterval) {
-                    throw new Error(`Job ${this.id} update polling timed out after ${timeoutMs}ms. The job may still be running.`);
+                    throw new Error(`Job ${this.id} SubscribableJob update polling timed out after ${timeoutMs}ms. The job may still be running.`);
                 }
             }), operators_1.switchMap(() => {
                 const id = this.id;

package/dist/job-queue/subscribable-job.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,mCAAmC,SAAS,mCAAmC,CAChG,CAAC;iBACL;YACL,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACX,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,EAAE;oBACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBAC1E;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,kBAAM,CAAC,iCAAkB,CAAC,EAC1B,gCAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,CAAC,EAC3D,qBAAS,CACL,GAAG,CAAC,EAAE,CACF,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,MAAM;gBAC9B,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS;gBAChC,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EACpC,IAAI,CACP,EACD,eAAG,CAAC,GAAG,CAAC,EAAE;gBACN,IAAI,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,MAAM,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACL,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChF,CAAC;SACL;IACL,CAAC;CACJ;AAjED,0CAiEC"}
+{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,mDAAmD,SAAS,mCAAmC,CAChH,CAAC;iBACL;YACL,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACX,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,EAAE;oBACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBAC1E;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,kBAAM,CAAC,iCAAkB,CAAC,EAC1B,gCAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,CAAC,EAC3D,qBAAS,CACL,GAAG,CAAC,EAAE,CACF,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,MAAM;gBAC9B,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS;gBAChC,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EACpC,IAAI,CACP,EACD,eAAG,CAAC,GAAG,CAAC,EAAE;gBACN,IAAI,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,MAAM,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACL,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChF,CAAC;SACL;IACL,CAAC;CACJ;AAjED,0CAiEC"}

package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js

@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const config_service_1 = require("../../../config/config.service");
 const inspectable_job_queue_strategy_1 = require("../../../config/job-queue/inspectable-job-queue-strategy");
+const vendure_logger_1 = require("../../../config/logger/vendure-logger");
 const job_queue_service_1 = require("../../../job-queue/job-queue.service");
 const subscribable_job_1 = require("../../../job-queue/subscribable-job");
 const constants_1 = require("../constants");
@@ -52,7 +53,11 @@ let SearchJobBufferService = class SearchJobBufferService {
         const collectionFilterJobs = await this.jobQueueService.flush(this.collectionJobBuffer);
         if (collectionFilterJobs.length && inspectable_job_queue_strategy_1.isInspectableJobQueueStrategy(jobQueueStrategy)) {
             const subscribableCollectionJobs = collectionFilterJobs.map(job => new subscribable_job_1.SubscribableJob(job, jobQueueStrategy));
-            await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs: 3 * 60 * 1000 }))).toPromise();
+            await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs: 15 * 60 * 1000 })))
+                .toPromise()
+                .catch(err => {
+                vendure_logger_1.Logger.error(err.message);
+            });
         }
         await this.jobQueueService.flush(this.searchIndexJobBuffer);
     }

package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAC9D,CACJ,CAAC,SAAS,EAAE,CAAC;SACjB;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAjDY,sBAAsB;IADlC,mBAAU,EAAE;IAQJ,WAAA,eAAM,CAAC,uCAA2B,CAAC,CAAA;qCAFX,mCAAe;QACjB,8BAAa;GAN/B,sBAAsB,CAiDlC;AAjDY,wDAAsB"}
+{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,0EAA+D;AAC/D,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAC/D,CACJ;iBACI,SAAS,EAAE;iBACX,KAAK,CAAC,GAAG,CAAC,EAAE;gBACT,uBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;SACV;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AArDY,sBAAsB;IADlC,mBAAU,EAAE;IAQJ,WAAA,eAAM,CAAC,uCAA2B,CAAC,CAAA;qCAFX,mCAAe;QACjB,8BAAa;GAN/B,sBAAsB,CAqDlC;AArDY,wDAAsB"}

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js

@@ -109,18 +109,18 @@ class MysqlSearchStrategy {
                 .select('si_inner.productId', 'inner_productId')
                 .addSelect('si_inner.productVariantId', 'inner_productVariantId')
                 .addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
-                .addSelect(`(SELECT sku_score) +
-                     MATCH (productName) AGAINST (:term) * 2 +
-                     MATCH (productVariantName) AGAINST (:term) * 1.5 +
-                     MATCH (description) AGAINST (:term)* 1`, 'score')
+                .addSelect(`(SELECT sku_score) +
+                     MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
+                     MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
+                     MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
                 .where(new typeorm_1.Brackets(qb1 => {
                 qb1.where('sku LIKE :like_term')
-                    .orWhere('MATCH (productName) AGAINST (:term)')
-                    .orWhere('MATCH (productVariantName) AGAINST (:term)')
-                    .orWhere('MATCH (description) AGAINST (:term)');
+                    .orWhere('MATCH (productName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (description) AGAINST (:term IN BOOLEAN MODE)');
             }))
                 .andWhere('channelId = :channelId')
-                .setParameters({ term, like_term: `%${term}%`, channelId: ctx.channelId });
+                .setParameters({ term: `${term}*`, like_term: `%${term}%`, channelId: ctx.channelId });
             qb.innerJoin(`(${termScoreQuery.getQuery()})`, 'term_result', 'inner_productId = si.productId')
                 .addSelect(input.groupByProduct ? 'MAX(term_result.score)' : 'term_result.score', 'score')
                 .andWhere('term_result.inner_productVariantId = si.productVariantId')